Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / src / domain / Offer.java

diff --git a/ruralHouses client/src/domain/Offer.java b/ruralHouses client/src/domain/Offer.java
new file mode 100644 (file)
index 0000000..3442a6a
--- /dev/null
+++ b/ruralHouses client/src/domain/Offer.java
@@ -0,0 +1,143 @@
+package domain;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Vector;
+
+
+@SuppressWarnings("serial")
+public class Offer implements Serializable {
+       
+
+       private int offerNumber;
+       private Date firstDay; // Dates are stored as java.util.Date objects instead of java.sql.Date objects
+       private Date lastDay;  // because, they are not well stored in db4o as java.util.Date objects
+       private float price;   // This is coherent because objects of java.sql.Date are objects of java.util.Date ç
+       private boolean isBooked;
+       private Vector<Booking> bookings = new Vector<Booking>();  // That is: java.sql.Date is a subclass (or extends) java.util.Date
+       private RuralHouse ruralHouse;
+
+       
+       public Offer(int offerNumber,RuralHouse ruralHouse, Date firstDay, Date lastDay, float price){
+                 this.firstDay=firstDay;
+                 this.lastDay=lastDay;
+                 this.price=price;
+                 this.ruralHouse=ruralHouse;
+                 this.offerNumber=offerNumber;
+       }
+       /**
+        * Get the house number of the offer
+        * 
+        * @return the house number
+        */
+       public RuralHouse getRuralHouse() {
+               return this.ruralHouse;
+       }
+
+       /**
+        * Set the house number to a offer
+        * 
+        * @param house number
+        */
+       public void setRuralHouse(RuralHouse ruralHouse) {
+               this.ruralHouse = ruralHouse;
+       }
+
+
+       /**
+        * Get the offer number
+        * 
+        * @return offer number
+        */
+       public int getOfferNumber() {
+               return this.offerNumber;
+       }
+
+       
+
+       /**
+        * Get the first day of the offer
+        * 
+        * @return the first day
+        */
+       public Date getFirstDay() {
+               return this.firstDay;
+       }
+
+       /**
+        * Set the first day of the offer
+        * 
+        * @param firstDay
+        *            The first day
+        */
+       public void setFirstDay(Date firstDay) {
+               this.firstDay = firstDay;
+       }
+
+       /**
+        * Get the last day of the offer
+        * 
+        * @return the last day
+        */
+       public Date getLastDay() {
+               return this.lastDay;
+       }
+
+       /**
+        * Set the last day of the offer
+        * 
+        * @param lastDay
+        *            The last day
+        */
+       public void setLastDay(Date lastDay) {
+               this.lastDay = lastDay;
+       }
+
+       /**
+        * Get the price
+        * 
+        * @return price
+        */
+       public float getPrice() {
+               return this.price;
+       }
+
+       /**
+        * Set the price
+        * 
+        * @param price
+        */
+       public void setPrice(float price) {
+               this.price = price;
+       }
+
+       
+       /**
+        * This method creates a book with a corresponding parameters
+        * 
+        * @param First day, last day, house number and telephone
+        * @return a book
+        */
+       public Vector<Booking> createBooking(int numBooking,Client client) {
+               Booking b = new Booking(numBooking,this,client);
+               this.bookings.add(b);
+               return this.bookings;
+                       
+       }
+       
+       public String toString(){
+               return firstDay.toString()+", "+lastDay.toString()+", "+price;
+       }
+       public Vector<Booking> getBookings() {
+               return bookings;
+       }
+       public void setBookings(Vector<Booking> bookings) {
+               this.bookings = bookings;
+       }
+       public boolean isBooked() {
+               return isBooked;
+       }
+       public void setBooked(boolean isBooked) {
+               this.isBooked = isBooked;
+       }
+}
\ No newline at end of file